f790ea
@@ -33,7 +33,8 @@
import javax.naming.InitialContext;
 import javax.security.auth.callback.CallbackHandler;
 
 import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
+import org.infinispan.configuration.cache.Configuration;
+import org.infinispan.configuration.cache.ConfigurationBuilder;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.jboss.as.security.SecurityLogger;
 import org.jboss.as.security.SecurityMessages;
@@ -286,7 +287,12 @@
public class JNDIBasedSecurityManagement implements ISecurityManagement {
             Cache cache = null;
             if (cacheManager != null) {
                 // TODO override global settings with security domain specific
-                cacheManager.defineConfiguration(securityDomain, "auth-cache", new Configuration());
+                ConfigurationBuilder builder = new ConfigurationBuilder();
+                Configuration baseCfg = cacheManager.getCacheConfiguration("auth-cache");
+                if (baseCfg != null) {
+                    builder.read(baseCfg);
+                }
+                cacheManager.defineConfiguration(securityDomain, builder.build());
                 cache = cacheManager.getCache(securityDomain);
             }
             if (cache != null && am instanceof CacheableManager) {
